Fix precendence problem. (Sven Neumann)

Mon Feb 25 12:47:25 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state):
        Fix precendence problem. (Sven Neumann)

diff --git a/ChangeLog b/ChangeLog
index 8ad5e26dae52fef94d1c3efdb002867a8157c6a2..3297b6813526f1e69f7abcb2ce4839d86c666a7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 25 12:47:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): 
+       Fix precendence problem. (Sven Neumann)
+
 Sun Feb 24 23:23:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testselection.c (main): Convert over to using

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8ad5e26dae52fef94d1c3efdb002867a8157c6a2..3297b6813526f1e69f7abcb2ce4839d86c666a7a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Feb 25 12:47:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): 
+       Fix precendence problem. (Sven Neumann)
+
 Sun Feb 24 23:23:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testselection.c (main): Convert over to using

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8ad5e26dae52fef94d1c3efdb002867a8157c6a2..3297b6813526f1e69f7abcb2ce4839d86c666a7a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Feb 25 12:47:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): 
+       Fix precendence problem. (Sven Neumann)
+
 Sun Feb 24 23:23:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testselection.c (main): Convert over to using

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8ad5e26dae52fef94d1c3efdb002867a8157c6a2..3297b6813526f1e69f7abcb2ce4839d86c666a7a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Feb 25 12:47:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): 
+       Fix precendence problem. (Sven Neumann)
+
 Sun Feb 24 23:23:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testselection.c (main): Convert over to using

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8ad5e26dae52fef94d1c3efdb002867a8157c6a2..3297b6813526f1e69f7abcb2ce4839d86c666a7a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Feb 25 12:47:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): 
+       Fix precendence problem. (Sven Neumann)
+
 Sun Feb 24 23:23:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testselection.c (main): Convert over to using

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8ad5e26dae52fef94d1c3efdb002867a8157c6a2..3297b6813526f1e69f7abcb2ce4839d86c666a7a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Feb 25 12:47:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): 
+       Fix precendence problem. (Sven Neumann)
+
 Sun Feb 24 23:23:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testselection.c (main): Convert over to using

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8ad5e26dae52fef94d1c3efdb002867a8157c6a2..3297b6813526f1e69f7abcb2ce4839d86c666a7a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Feb 25 12:47:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): 
+       Fix precendence problem. (Sven Neumann)
+
 Sun Feb 24 23:23:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testselection.c (main): Convert over to using

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index e6eb7e125c548945b0584269c9b32d18c518fa8b..3d43d61ebf6f019d54f453a606e8393930f529ed 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -839,7 +839,7 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,
    * However, <shift>Tab is not _consistently_ GDK_ISO_Left_Tab, so people
    * can't bind to GDK_ISO_Left_Tab instead. So, we force consistency here.
    */
-  if (tmp_keyval == GDK_Tab && (tmp_modifiers & GDK_SHIFT_MASK == 0))
+  if (tmp_keyval == GDK_Tab && (tmp_modifiers & GDK_SHIFT_MASK) == 0)
     {
       tmp_keyval = GDK_ISO_Left_Tab;
       tmp_modifiers |= GDK_SHIFT_MASK;